Revert all the stuffs i've done
More missing drawables
Some more minor indenting