Some ui fixes, add comment possibility