changed the layout but still need to finish