Fixed some bugs and cleaned code @ AdjustmentView