removed unused tags
updated button positions
updated ui layout