Fixed layout scaling issues