Simplifying toolbar and some resources cleanup