-clean up java code
-moved some dimens to dimens file
-clean the xml