Remove unnecessary var
Improve layout for N screens. Add test button