Updating and fine tuning...

We are currently fixing a few issues Thank You - NrlPortal