Fixed image display in tabs and maintaining tab focus on new tab
Signed-off-by:Arie <arieclaassens@gmail.com>