hibernate fixes
UI layout fixes