fixed few bugs
finished all the layouts