Adds button popup support (Version 1.1)

Also big cleanup and more changes
Version set to 1.1