Changed some layouts in main activity, add options button