Fixed issues with interactions
Moved setup buttons up slightly