Update for better layout