Some layout Changes