More work on bootstrap-3 updates

Signed-off-by: Arief M Utama <arief.utama@gmail.com>
More work on bootstrap-3 updates - layout

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