Further update layout