Small Changes before launch

Minor adjustments and button changes