Fixed basic UI stuff as per group meeting