Enhance some parts of application viewer