Changed static numbers to variables
Test for layout