Subject: commented and indented code

Description:

TODO:

1) rating
2) UI: buttons and layout color etc..