fixed some issues on layout.. Still fixing