issue-47 bottom toolbar is also fixed