Commit with condensed toolbar and tools addition - in progress