finished up formatting and layouts