Button and main

Just the few extra changes to button and main