layout/functionality enchancements