Reverted to previous state, layout issues