Moved lib from testproject to main
Added addBar and buttons