Akshay: Fixing some display issues