Bug #15440 fixed and updated with the chnages of removing fixed height anf fixed width and added margin and padding