Fixed various scaling issues for readability