Some small code changes but some big Visual changes

Almost done :P one bug to fix :)