added layout fixes