Making changes to server and keep it consitance

@mavis not sure how you feel about this changes, but I think it will be easier to maintain and also kind of match with other (most) of our apps.