Fixing board logic - moved all logic to Front-end