Sync framework

Signed-off-by: Arief M Utama <arief.utama@gmail.com>
Align views and layouts

Signed-off-by: Arief M Utama <arief.utama@gmail.com>