Comments and layouts

Added comments and worked on layouts