Clean up relative layout and padding