Fixing responsive issue & reordering css