Toolbar added, design reworked.