added extra features to test layout
reverted to initial layout