Fixing some presentation issue