jquery refactoring
ui fixes