Cleaned up fill_up layout