layout improvements
little layout fixes