Fixed some bugs and improved layout a little to be more usable
Incresing version to 1.30 (7)