ui cleanup and added shortcodes