Removing un-needed functions :D

and fixed some layouts