Fixing styles and close app logic