Changed layout and added TODO to change method call