Fixed layout bug
Added gson annotations
Added comments
Added icons