Small Layout change as discussed