Add Right and Bottom position functions and cleanup some code