Fixed a fw minor bugs, made basic layout